Still trying to make it work with 2.4.0