Fix for issue #1395