Fixed bug #27