fixed for new formats