Fixed a logic error (fluid-filled non-buckets would have been returned to the user)