Fix for issue #1585

Fixed Issue #1585... nice and simple!