Fix building system