Fix for part of issue #1440