Bug/m n limits

Closes #1996