Removed buffer fill check because it caused bugs