Fixes 20130609