Fix based on @tommalbran's feedback.