OTA Building Fix