Fix validation (contributed by Raffaela Groner)

Change-Id: If3a6c51e8ddbc1ba320f58018833e4b96a42ef5f
15 files changed