Make compatible with 1.6.0 for Ubuntu.