#9 - Fixing sample template