Deprecated still, but at least it works now