happens to fix both #145 and #146 adequately for now.