Remove debug line & correct a bug