add bucket check on load