remove hacky workaround