Fix for keyword behaviour