A patch in VB (one of my first code, very ugly) - View it on GitHub