Bug fix for debug commented out