Fixes 20130601