Better Fixes for #1486
Proper fix
Rename for clarity