Use data-fix for Fix and fix path parsing bug