Fix access to bucket