solved some problems introduced with STREAMING switch