fix bug 14/5/15