#48, remove limit