rebuild + fix #2539