Small fix to KL25's code.
Merge branch 'origin/develop'