Another minor fix on the autoend