Added extra check for set limit options