Fixed -d option not being enforced