Updated to work with 1.4.6 installations