fixed trailing issues