Fixed bug 9