Fixed curve movement bugs