Fixes Navigation Handhelds