Fixes 20130709 2