fixed #646