#2 debug fix