Rebuild properly