Less stupid validation