Rebuild bugfix