Patched for Ubuntu 12.04