Fix for issue #41