* Not sure this is what Glaxx would want. But hey, it fixes tests. *coughs*