fix for back button, issue # 16