Added protection for fast movements