Fixes 20130513