Fixed an issue with keywords (spaces weren't mandatory)