partial fix to Client-side. Moving Milestone3(M3) to 1 March, 2014: 1 week lost for this issue