Fixed bug in TPB provider
Merge branch 'origin/development'