Possibly fixing weird navigation flash issue