Should fix #107

A VERY special thanks to johnc@valve for making this happen!