Finally fixed building