Another attempted workaround