fixed fluid behavior, close #1510