Minimum changes to solve a bug