extending fix to issue #56