Allowed checking of non punctual marks
fixed merge conflict