Fix feature-D fixed #1