Fix for Vanilla-238.

Signed-off-by: William Lebel <lebelwilliam@gmail.com>