Fix #1367

Fixed only for  `extrafields` part. Whole problem described in #1369