Awood/gb validation fix