Fixes 20130701