fix a little supprise after merging