fixing issue #11