Anyone have an update? I am on the same boat and can find no work around