[PATCH 01/16] quick fix to make things validate