Fixed a regression done on 29 dec, 2012.