Fixed trailing bug