Minor change of autoend, should fix an issue