#1067 - Fix error on saving nav