workaround for fabric bug