be more strict - fixes 14ce11c778