with M+R's fixes (20140820)