Fix to work with 1.9.3