Fixing template task