Fixed major bug with AET construction