[FOLD] Bug fix 6