Attempt to make rebuilding smoother