Fixed bug #141