fixed bugs onBack