fix for issue #39