Fix #646