Yet another attempt at workaround