Resolves issue #1454