Fix template size, Changeset on 15-08-2014