Fixes 20130706 2