Fix bug 21

Fixed bug 21