3 Commits (idb-fix)