fixed bug
final