trying to fix parsing