fixing issue #9
fixing issue #9