(GH-489) Incorrect Debug-information fixed