Added debugging to help with issue #65