it's not not really a fix, but a hack/workaround