Fix problem with operation validation