Fixed weird ass auto-commit bug