Fix the previous fix for issue #55