Reduced_lines_of_code/fixed_entity_id_issue #217