Conflict with Cwicly template

Fixed Bugs
15

This should be fixed in the latest update 1.1.8.4