Created attachment 130967 [details] [review] dpm patch @Adam, please try applying the attached patch and let me know if it helps with your issue?