Fixed Go Back creating new entries issue