Add fix that should've been in last commit