MP1-4569: Even safer fix