Fixes #584. Missed the other location we do the same thing