Fixed bug #405