Fixes 20130508 part1