fix limits Fixed #216
Merge branch 'fix-limits-stream' into develop