Fixed the base template