Global fix

See source comment