Fix for issue #1531