Fix a problem with working on comissions
Merge branch 'leon'