Fixed the second problem