Fixes 20130504 part3