Fixes 20130510