Fix default rebuild behaviour