fixed for new format