Fixed problem with d&d