Expirity selector fix