Adding a clean way of dealing with #107