fixing issue #418