bugfix - crash on navigation