closes jaws-project/jaws#86