(v0.8.4) Limitations being properly enforced