fixes bucket lookup, do some quick & dirty testing