Solving issue: #11