SUP 412 added missing part of the code fix