fixing piecemeal