Fixed issue with big selections