Fixing final validation error - I hope