Fixed bug #132