Fixes validation