Your logic about solving the second problem also applies to the first.