Fixed problem with push navigation