Another Ubuntu-10.04 fix