Fixed timing issues with AET construction