Possible fix for #84

Potential solution to #84