Avoid notice on Drizzle
Merge commit '104d213'