Fixed bug #26