fix for issue #17