Fix prematurely calling back