Transitional handling of zero samples, temporary code
Zero samples handing improved