Fixup: Check for id and hash callback before executing anything