Fixed Error

final version