Issue 418 fixed