Fix for Canola