Improve compatibility