Fixed find bug