Yeah, the add shader is definitely the culprit. It was the whole reason why I suggested using the compositor for now. I simply don’t have the time to write a patch to handle this problem. I’m currently neck deep in another project. 
But Here’s a quick setup I threw together to hopefully give you a nudge in the right direction!
