ugly hack.. I need a real fix for this