Fix for issue #1324