Fixed bug 161