Another workaround attempt