[Fixed #434]