should properly handle zero messages now