Stack navigation bug fix