fixed moar validation