Fix for mesa