[FOLD] Bug fix 7