Fixed bug #131