tried rearranging the packup but it didn't really help...it just fails more efficiently now, lol See merge request !23