part of previous workaround, obsolete now