Tweaking issue 105 to work for me