Fixing rebuild issue.