V1.9 fixes
1.91 C