fix bug 11-02-2014