Probably related to #40
Probably related to #40