[FOLD] Bug fix 5