Matt ATD fix http://openatd.trac.wordpress.org/ticket/220