Fix keyword factory