fixed the comeback issue