Fixed double back issue