Floating bucket fix