Fix #85

Includes partial fix for #84