Fix pumping fluids, closes #27