Fix/6 july 2014