Proposal patch for v35

I created unstable branch cause I'm not sure whether the patch is gonna work.