addressed issue #3