Fixed bug @ Tome