trying to fix math support