Refactoring of #2, was actually a typo issue.