added back validation to see if bug is fixed