fix callback assignment

Hello @nicks, 

Please review the following commits I made in branch 'giannic-wat'.

6bd94c25fcc87da82247fbd8192cf995ecc89def (2014-03-27 17:06:48 -0700)
fix callback assignment

R=@nicks