Fix #777