[Fixed #430]