Fix #784