We cannot change  if the element in not null in  + clean code + fix regex for multiple lines comment -- Related to #1212 and #1214