Fixes #77

@Octobomb your pens. Related to #78