WIP fix validation warning