fix desugaring bug with and