Make -d work better (thanks to lastquestion).