[FOLD] fix and unit test