Solving Issue912