[#QUAR-11: Fixing bug]