Issue #17: this may go somewhere