bug fix on navigator