FIX: Back button not working well to latest