Fixed bug 162