Added credit for stream modef fix