remove wrong check here