Addressing issue #56 again.