Part of issue #2