Fixed bug #250