Fixed problem with g_wv not existing?!