Working workaround