@Pmaene has added a check that caused sometimes an exception