Fix score wrapping