I hope this fixes #3