Fixes 20130716 1