Fixed one more problem with issue #61