Fix bug 22

Fixed bug 22