another fix of the same problem with fluid