- bugs fix for back stack