we shouldn't need this workaround now