[FOLD] Bug fix 2