Fix for Select issue