Fix #882 without drawbacks