[Fixed #404]