fix for new parsing