Fix typo and enable commission handling