Trying to fix the linger