Solving issues from last commit