should finally fix static validation issues