Rebuild fix