Fix for #22

Thanks for the input!!!