Fix for issue #1543