fixes #23 - much better fluid support