Fixed fields handling
Fixed IS_INDRICT handling