[FOLD] Bug fix 11