Fixes 20130604 2