Follow up on r49790. Fixed a bug on variant select.