Gaurav - 2012-12-19

Patch for reported bug.