Fixes #34. Kind of