Addresses #29, hopefully fixed