working under fixing bug 21:55 11.09.2013