Merge pull request #700 from TheBlueMatt/qtalertfix