this should address #39