Fixed bug... again