fix dovetail branch issue