Fixed bug 5