more solid limit handling
2.0.4