fixed bug 17 July 2013