further fix for issue #51. ref: pr #53