[FOLD] Bug fix 10