OP-1383 minor improvment to original fix + better comment