Fixes 20130707