Fix to currColor and currThickness not being preserved