414 and 418 bugs fixed.