Updated based on @TomMalbran's feedback.