[#WTCNTAPP-3: Fixing bug]