Fixed bug #252