this addresses #17, probably more needed