Fix onAfterFetch not fired on first fetch