Debug fixing in Image template