address selector bug fix