Merge Fix

Signed-off-by: Alexander Ivannikov <Alexivan_91@hotmail.com>