Fixing short template