Tweak to make the fill work properly with the handle