Look! This fixes #3

I think I've got it right this time!! :)