fixing issue #28