Fixes compatibility with Neat, and reduces potential for oversizing
v0.5.1