Fixed & rebuilded