And a fix