I HATE EVERYTHING; Major bug fix for architecture builds [2.1 release]