finished fixing #79