Fixes 20130512 2