Additional fix from @robertkowalski