Better promotion field index handling (LEV-179)