Fix feature-D2