Fixed issue with shout outs