Another terrible bug fixed and rebuilded