Fix #116

Possible fix for #116, sorry for not testing.