Fixing template include bug