compatibility with ubuntu
Updated patch from March