#48, add limit