This looks like the correct way to fix this