possible fix/workaround for #35