Fixed bug.
Merge branch 'tp'