fixing issue #238