[#OPINST-10: Fixing bug]