Hopeful fix to error with MBS-7621 by unwrapping value