Messages arg fix