Fixed the sample again
Merge branch 'master' into stable