Fixed bug in D+