Another workaround