Compiler Type cast Fixed along with template changes.