Finished fixing #164