Fix user indicator wrapping bug