#384240, fixed Unbucket functionality.