Hack to get this stupid shit working.  Hopefully Azil can figure out whats really going on.