fixing issue #3
fixing issue #2