Issues fix 22-Dec-2014