Prevent wrap around (Remi Collet at redhat)