Fixed #646