Fixes 20130601 2