Issue#768 second dunning

Closes #768
Chose the first solution because it made more sense an was also easy to implement.