Fixes validation message problem, #169