Fix for issue #56