A stable version of both default allocator and opti-allocator
Fix a possible bug