Fixing 1.9 debug issue