fixed the kickback bug