Updated issue 20130320