Fixing draining and filling