Fixed bug #29