FIX: changed template loading