Fixed bug 148