#SB-2458 fixed