more fixes? x 2