Fixed bug 97