addressed issue #2