Fixed bug #25

Fixed bug #25