Bug fix for uid and comment