Fixed bug 74