Finish fixing #30 :/