Update issue 12 [RQ-120]