Fix for issue #1067