fixed 'this' refs