Please be a magic fix-commit!