[FIX] Correct instances creation at record creation