Fixes the template issue once and for all