Fix issue 173

Let's try this again.