Scheme changes after patch