Custom select component fix