Fix orange bug