Expectations fix