Added fix 2.4 - 16.11.2013