MDL-41774 even better