further fix for issue #57