small changes for compatibility with AT 1.6.4