fix for both single and multi selector