Tested fix for issue #34