bug in find usages fixed
(cherry picked from commit c34319c)