Workaround not longer needed