#305 better find after zip