Fix for keyword use