Fix for #46. Let's see if this does it