Added an extra validation check so that