Resolves more of issue #1441