update to 2.2.5 and validation fix