Fixed bug 98