FIX: Free stream
UPD: Re-factoring