Workaround for crash on search by ID