implemented fix for issue #64