fix our scheme