added in sorting fix, [touch: 35-hipchat-source]