Fixes 20130709