Fix problem with returning item if found