Fixed bug #135