[FIX] Changes by Slavko on Nov 30, 2013;