Address error-prone warning