Better stability after refactor.