Bug fix for typo and upgrade