Fix to work with sandboxes