Fix for issue #369