Final bug fixed