fix for issue #41