Fixed Rebuilding Errors