Make sure it works with java6