cleaning up and retesting issue #50