WIP: remove double from expectation