[FOLD] Bug fix 1