improve limit test and mark like final public interface method