Fixed max size support
0.7.2