FIX Problems in the template