Improve reliability