Fix for issue #1498. Resolved.