fix for issue #31