Fix for ubuntu-10