Fix bug with fluid makeup in back-end