Attempts to solve buffer clear issues