completed fix for issue #49