Fixed bug 73