Stops being lazy and handles buffer properly