Merge "Fix validation (contributed by Raffaela Groner)"