Second fix to issue #56