fix for issue #58