Fixed annoying tail flipping!!!