Fix keeper to set timeout