removed old workaround yields