addressed issue #1