Ensuring the correct fork value is passed to callbacks