Fixes 20130709 3