Improve consistency