Actually fix #109

- Note: This is whack. Totally whack.