Updated to work with MT 0.4.11