Comment wrap issue fixed