cleanup of issue #2