Fixes 20130607