fix non-liquid parsing?