fixing further validation