FIXED AUTOCOMMITING!