Debug Bug fixed