[#OPINST-26: Fixing bug]