More fix on autonexttick