applying patch for STRATOS-507 - provided by jeffrey