Fix #84

This (hopefully) fix #84