Fixed bug 71
Fixed bug 74