Fixed bug where navigation breaks for users with non-US locale