Fixed a base template bug...