20141215 - Fixed leading zero issue