Added preparator condition checking in execute