fix for issue #154