Hax for 10.04 support