Bugfix/validate file