[FOLD] Bug fix 4