hot fix for issue #123