Fix up on the go