Sure... can fix it, but I think we should also deprecate it entirely for a better way. It's just too clumsy - always has been.