Fixing bug with the timeout happening every minute