fix for issue #11