oh la la! dirty, dirty dirty.. temp fix for getting stuff working so we can continue development until a proper fix can be devised