Fixing when no entry found