#799 - Included missing if statement on old Ids