Fix liquid, make branch conditional