Updated fix for issue #31