Fixed Motion Bug (alpha)