Fix for issue #41

Really quick fix for #41, not perfect but working. Tested on ST2/ST3 Win7 64