workaround no longer needed