Score wrapping fixed