bug fix v1.1
resolve index conflict
added p for release 2 from r2 merged branch