fixing issue #27