fix v.2

Minor changes