Update for @SimonLarsen on #59