Fixed bug 1 more