Added more protection to SelectionLimiter