Bug fix: add fallback for old format