Fixes 20130510 2