Improve code stability