addresses #77