fixing errors related to new format