one more fix for new format