Fix rebuild