I hope this fixes #197