Fixed the complete message bug