fixed undefined tr
Merge branch 'master' into issue754