06/01/2013 multiple fixes