Fix #952