2 Commits (debug-guards)