Fix for issue #1515