[FOLD] Bug fix 3