resolves #9 and this time I mean it. :)