Fixed then() wrapper