Changed -- to -D to fix errors found by Utensil.