V0.0.3, revert fold to fix performance degrade