Fix #652