fixed incorrect scheduling of class
Merge branch 'master' into pinauthintegration