Fix double digit issue. Finally !