Fixed bug 44