fixed issue from 25/06/2013