Fixes callback being called to early