commited for back button issue