Fixed Bug on From