a fix for issue #17