Continue fix: Do the isAlive check at the right place