Update fix for issue #51