Better handling of DP saved for later (fixes #2)