Fixed timing issue with going back