fixing issue #201