unpretty fix for issue #2