Bug 418

see #418