Removed dumb bug concerning set (was still using a buffer).