Bucket controls now re-binded correctly