little bug on template system corrected.