[finishes #69811112] - fixes bucket validation