addressing (and hopefully fixing) #33