[FOLD] Bug fix 8