Debug print and type fix
Merged