language changes: &mut Buffer is invalid at the moment, work around.