stream and this clashing fix