V0.1.6, revert fold to fix performance degrade