[Fixed #433]