CRUISE: Add a safeguard to avoid a buffer overflow