Fixed Weird bugs