Fixes 20130706