30/12/13 afternoon 2

fix bug 24