Fix breaking Element Select