Fix for back arrow