Bugfix for last commit (some validation code was commented out)