Fixes 20130708