Attempt to fix Omni building...