Addresses #29 again