fixes #71. fixes #76