Applied ERD fix