Fixing hopefully for the last time the HALAA bugs.