minor change - remove hacky patch