[FOLD] Bug fix 9