Proposal patch for v31

I'm not sure if it's gonna work, I have one more idea, but at least we can try :)