Finish fixing #9