dirty fix for some problemes