- fixed bug 25/04/2014