Added check size limit