Slightly better workaround.