improved internal commit handling