Fixed bug #149