Fixed bug 72
Fixed bug 72