fixed abug