Fixes Navigation is broken #14"