more #116 fixing