Temporarily fixed the last generation errors