adapt to the latest rake