Windup 222 - Added the lost commit

you are right, the fix was cancelled along with one commit and I forgot to add it back there. Good note, will add it back, thank you.