fixed + stream bug