Fix coming next build