Back button fix
Fix #378