Actually fix bug in commit c765d9468db17f34a45e1ef52082d52592a736e7