Fixes #1486
Better Fixes for #1486
Proper fix
Rename for clarity
Fixes #1483